File diff and checkpoints (WIP)

.github/workflows/bundle-desktop-intel.yml

@@ -82,7 +82,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: ${{ inputs.ref }}
+          # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior
+          ref: ${{ inputs.ref != '' && inputs.ref || '' }}
           fetch-depth: 0
 
       # Update versions before build

.github/workflows/bundle-desktop-linux.yml

@@ -28,7 +28,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
         with:
-          ref: ${{ inputs.ref }}
+          # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior
+          ref: ${{ inputs.ref != '' && inputs.ref || '' }}
           fetch-depth: 0
 
       # 2) Update versions before build
@@ -264,4 +265,4 @@ jobs:
           path: |
             ui/desktop/out/make/deb/x64/*.deb
             ui/desktop/out/make/rpm/x64/*.rpm
-          if-no-files-found: error
+          if-no-files-found: error

.github/workflows/bundle-desktop-windows.yml

@@ -17,10 +17,10 @@ on:
         type: boolean
         default: false
       ref:
-        description: 'Git ref to checkout'
+        description: 'Git ref to checkout (branch, tag, or SHA). Defaults to main branch if not specified.'
         required: false
         type: string
-        default: 'refs/heads/main'
+        default: ''
     secrets:
       WINDOWS_CODESIGN_CERTIFICATE:
         required: false
@@ -41,19 +41,42 @@ jobs:
     runs-on: ubuntu-latest  # Use Ubuntu for cross-compilation
 
     steps:
+      # Debug information about the workflow and inputs
+      - name: Debug workflow info
+        env:
+          WORKFLOW_NAME: ${{ github.workflow }}
+          WORKFLOW_REF: ${{ github.ref }}
+          EVENT_NAME: ${{ github.event_name }}
+          REPOSITORY: ${{ github.repository }}
+          INPUT_REF: ${{ inputs.ref }}
+          INPUT_VERSION: ${{ inputs.version }}
+          INPUT_SIGNING: ${{ inputs.signing }}
+        run: |
+          echo "=== Workflow Information ==="
+          echo "Workflow: ${WORKFLOW_NAME}"
+          echo "Ref: ${WORKFLOW_REF}"
+          echo "Event: ${EVENT_NAME}"
+          echo "Repo: ${REPOSITORY}"
+          echo ""
+          echo "=== Input Parameters ==="
+          echo "Build ref: ${INPUT_REF:-<default branch>}"
+          echo "Version: ${INPUT_VERSION:-not set}"
+          echo "Signing: ${INPUT_SIGNING:-false}"
+
       # 1) Check out source
       - name: Checkout repository
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
         with:
-          ref: ${{ inputs.ref }}
+          # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior
+          ref: ${{ inputs.ref != '' && inputs.ref || '' }}
           fetch-depth: 0
 
       # 2) Configure AWS credentials for code signing
       - name: Configure AWS credentials
         if: inputs.signing && inputs.signing == true
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # ratchet:aws-actions/configure-aws-credentials@v4
         with:
-          role-to-assume: ${{ github.ref == 'refs/heads/main' && secrets.WINDOW_SIGNING_ROLE || secrets.WINDOW_SIGNING_ROLE_TAG }}
+          role-to-assume: ${{ (inputs.ref == '' || inputs.ref == 'refs/heads/main') && secrets.WINDOW_SIGNING_ROLE || secrets.WINDOW_SIGNING_ROLE_TAG }}
           aws-region: us-west-2
 
       # 2) Set up Node.js
@@ -99,10 +122,10 @@ jobs:
       - name: Build Windows executable using Docker cross-compilation with enhanced caching
         run: |
           echo "🚀 Building Windows executable with enhanced GitHub Actions caching..."
-          
+
           # Create cache directories
           mkdir -p ~/.cargo/registry ~/.cargo/git
-          
+
           # Use enhanced caching with GitHub Actions cache mounts
           docker run --rm \
             -v "$(pwd)":/usr/src/myapp \
@@ -115,27 +138,27 @@ jobs:
               echo '=== Setting up Rust environment with caching ==='
               export CARGO_HOME=/usr/local/cargo
               export PATH=/usr/local/cargo/bin:\$PATH
-              
+
               # Check if Windows target is already installed in cache
               if rustup target list --installed | grep -q x86_64-pc-windows-gnu; then
                 echo '✅ Windows cross-compilation target already installed'
               else
                 echo '📦 Installing Windows cross-compilation target...'
                 rustup target add x86_64-pc-windows-gnu
               fi
-              
+
               echo '=== Setting up build dependencies ==='
               apt-get update
               apt-get install -y mingw-w64 protobuf-compiler cmake time
-              
+
               echo '=== Setting up cross-compilation environment ==='
               export CC_x86_64_pc_windows_gnu=x86_64-w64-mingw32-gcc
               export CXX_x86_64_pc_windows_gnu=x86_64-w64-mingw32-g++
               export AR_x86_64_pc_windows_gnu=x86_64-w64-mingw32-ar
               export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc
               export PKG_CONFIG_ALLOW_CROSS=1
               export PROTOC=/usr/bin/protoc
-              
+
               echo '=== Optimized Cargo configuration ==='
               mkdir -p .cargo
               echo '[build]' > .cargo/config.toml
@@ -157,7 +180,7 @@ jobs:
               echo '' >> .cargo/config.toml
               echo '[registries.crates-io]' >> .cargo/config.toml
               echo 'protocol = \"sparse\"' >> .cargo/config.toml
-              
+
               echo '=== Building with cached dependencies ==='
               # Check if we have cached build artifacts
               if [ -d target/x86_64-pc-windows-gnu/release/deps ] && [ \"\$(ls -A target/x86_64-pc-windows-gnu/release/deps)\" ]; then
@@ -167,31 +190,31 @@ jobs:
                 echo '🔨 No cached artifacts found, performing full build...'
                 CARGO_INCREMENTAL=0
               fi
-              
+
               echo '🔨 Building Windows executable...'
               CARGO_INCREMENTAL=\$CARGO_INCREMENTAL \
               CARGO_NET_RETRY=3 \
               CARGO_HTTP_TIMEOUT=60 \
               RUST_BACKTRACE=1 \
               cargo build --release --target x86_64-pc-windows-gnu --jobs 4
-              
+
               echo '=== Copying Windows runtime DLLs ==='
               GCC_DIR=\$(ls -d /usr/lib/gcc/x86_64-w64-mingw32/*/ | head -n 1)
               cp \"\$GCC_DIR/libstdc++-6.dll\" target/x86_64-pc-windows-gnu/release/
               cp \"\$GCC_DIR/libgcc_s_seh-1.dll\" target/x86_64-pc-windows-gnu/release/
               cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll target/x86_64-pc-windows-gnu/release/
-              
+
               echo '✅ Build completed successfully!'
               ls -la target/x86_64-pc-windows-gnu/release/
             "
-          
+
           # Verify build succeeded
           if [ ! -f "./target/x86_64-pc-windows-gnu/release/goosed.exe" ]; then
             echo "❌ Windows binary not found."
             ls -la ./target/x86_64-pc-windows-gnu/release/ || echo "Release directory doesn't exist"
             exit 1
           fi
-          
+
           echo "✅ Windows binary found!"
           ls -la ./target/x86_64-pc-windows-gnu/release/goosed.exe
           ls -la ./target/x86_64-pc-windows-gnu/release/*.dll
@@ -229,31 +252,31 @@ jobs:
             echo "Windows binary not found."
             exit 1
           fi
-          
+
           if [ ! -f "./temporal-service/temporal-service.exe" ]; then
             echo "temporal-service.exe not found."
             exit 1
           fi
-          
+
           if [ ! -f "./temporal.exe" ]; then
             echo "temporal.exe not found."
             exit 1
           fi
-          
+
           echo "Cleaning destination directory..."
           rm -rf ./ui/desktop/src/bin
           mkdir -p ./ui/desktop/src/bin
-          
+
           echo "Copying Windows binary and DLLs..."
           cp -f ./target/x86_64-pc-windows-gnu/release/goosed.exe ./ui/desktop/src/bin/
           cp -f ./target/x86_64-pc-windows-gnu/release/*.dll ./ui/desktop/src/bin/
-          
+
           echo "Copying temporal-service.exe..."
           cp -f ./temporal-service/temporal-service.exe ./ui/desktop/src/bin/
-          
+
           echo "Copying temporal.exe..."
           cp -f ./temporal.exe ./ui/desktop/src/bin/
-          
+
           # Copy Windows platform files (tools, scripts, etc.)
           if [ -d "./ui/desktop/src/platform/windows/bin" ]; then
             echo "Copying Windows platform files..."
@@ -262,7 +285,7 @@ jobs:
                 cp -f "$file" ./ui/desktop/src/bin/
               fi
             done
-            
+
             if [ -d "./ui/desktop/src/platform/windows/bin/goose-npm" ]; then
               echo "Setting up npm environment..."
               rsync -a --delete ./ui/desktop/src/platform/windows/bin/goose-npm/ ./ui/desktop/src/bin/goose-npm/
@@ -274,18 +297,18 @@ jobs:
       - name: Build desktop UI with npm
         run: |
           cd ui/desktop
-          
+
           # Fix for rollup native module issue (npm optional dependencies bug)
           echo "🔧 Fixing npm optional dependencies issue..."
           rm -rf node_modules package-lock.json
           npm install
-          
+
           # Verify rollup native module is installed
           if [ ! -d "node_modules/@rollup/rollup-linux-x64-gnu" ]; then
             echo "⚠️ Rollup native module missing, installing manually..."
             npm install @rollup/rollup-linux-x64-gnu --save-optional
           fi
-          
+
           npm run bundle:windows
 
       # 7) Copy exe/dll to final out folder and prepare flat distribution
@@ -294,11 +317,11 @@ jobs:
           cd ui/desktop
           mkdir -p ./out/Goose-win32-x64/resources/bin
           rsync -av src/bin/ out/Goose-win32-x64/resources/bin/
-          
+
           # Create flat distribution structure
           mkdir -p ./dist-windows
           cp -r ./out/Goose-win32-x64/* ./dist-windows/
-          
+
           # Verify the final structure
           echo "📋 Final flat distribution structure:"
           ls -la ./dist-windows/
@@ -311,25 +334,25 @@ jobs:
         run: |
           set -exuo pipefail
           echo "🔐 Starting Windows code signing with jsign + AWS KMS..."
-          
+
           # Create certificate file from secret
           echo "📝 Creating certificate file from GitHub secret..."
           echo "${{ secrets.WINDOWS_CODESIGN_CERTIFICATE }}" > block-codesign-cert.pem
-          
+
           # Install Java (required for jsign)
           echo "☕ Installing Java runtime..."
           sudo apt-get update
           sudo apt-get install -y openjdk-11-jre-headless osslsigncode
-          
+
           # Download jsign
           echo "📥 Downloading jsign..."
           wget -q https://github.com/ebourg/jsign/releases/download/6.0/jsign-6.0.jar -O jsign.jar
           echo "05ca18d4ab7b8c2183289b5378d32860f0ea0f3bdab1f1b8cae5894fb225fa8a  jsign.jar" | sha256sum -c
-          
+
           # Sign the main Electron executable (Goose.exe)
           echo "🔐 Signing main Electron executable: Goose.exe"
           cd ui/desktop/dist-windows/
-          
+
           java -jar ${GITHUB_WORKSPACE}/jsign.jar \
             --storetype AWS \
             --keystore us-west-2 \
@@ -343,11 +366,11 @@ jobs:
 
           osslsigncode verify Goose.exe
           echo "✅ Main executable Goose.exe signed successfully"
-          
+
           # Sign the backend executable (goosed.exe)
           echo "🔐 Signing backend executable: goosed.exe"
           cd resources/bin/
-          
+
           java -jar ${GITHUB_WORKSPACE}/jsign.jar \
             --storetype AWS \
             --keystore us-west-2 \
@@ -369,7 +392,7 @@ jobs:
           sha256sum Goose.exe
           ls -la resources/bin/goosed.exe
           sha256sum resources/bin/goosed.exe
-          
+
           # Clean up certificate file
           rm -f ${GITHUB_WORKSPACE}/block-codesign-cert.pem
 
@@ -382,7 +405,7 @@ jobs:
           ls -la ui/desktop/dist-windows/Goose.exe
           osslsigncode verify ui/desktop/dist-windows/Goose.exe
           echo "✅ Main executable signature verification passed"
-          
+
           echo "Backend executable:"
           ls -la ui/desktop/dist-windows/resources/bin/goosed.exe
           osslsigncode verify ui/desktop/dist-windows/resources/bin/goosed.exe
@@ -393,13 +416,13 @@ jobs:
         run: |
           cd ui/desktop
           echo "📦 Creating Windows zip package..."
-          
+
           # Create a zip file from the dist-windows directory
           zip -r "Goose-win32-x64.zip" dist-windows/
-          
+
           echo "✅ Windows zip package created:"
           ls -la Goose-win32-x64.zip
-          
+
           # Also create the zip in the expected output structure for consistency
           mkdir -p out/Goose-win32-x64/
           cp Goose-win32-x64.zip out/Goose-win32-x64/

crates/goose-mcp/Cargo.toml

@@ -35,6 +35,7 @@ reqwest = { version = "0.11", features = [
 ], default-features = false }
 async-trait = "0.1"
 chrono = { version = "0.4.38", features = ["serde"] }
+similar = { version = "2.4", features = ["inline"] }
 etcetera = "0.8.0"
 tempfile = "3.8"
 include_dir = "0.7.4"