Merge remote-tracking branch 'origin/main' into wpfleger/socket-support

* origin/main: (72 commits)
  No Check do Check (#7942)
  Log 500 errors and also show error for direct download (#7936)
  fix: retry on authentication failure with credential refresh (#7812)
  Remove java/.ai-usage-marker directory (#7925)
  test(acp): add terminal delegation fixtures and fix shell singleton (#7923)
  fix: bump pctx_code_mode to 0.3.0 for iterator type checking fix (#7892)
  feat: persist GooseMode per-session via session DB (#7854)
  feat(otel): propagate session.id to spans and log records (#7490)
  fix(test): add env_lock to is_openai_reasoning_model tests (#7917)
  fix(acp): pass session_id when loading extensions so skills are discovered (#7868)
  updated canonical models (#7920)
  feat(autovisualiser): Migrate the autovisualiser extension to MCP Apps  (#7852)
  fix: add tool_choice and parallel_tool_calls to chatgpt_codex provider (#7867)
  fix: tool confirmation handling for multiple requests (#7856)
  Remove dead OllamaSetup onboarding flow (#7861)
  fix: resolve tokio::sync::Mutex deadlock in recipe retry path (#7832)
  Upgrade Electron 40.6.0 → 41.0.0 (#7851)
  Only show up to 50 lines of source code (#7578)
  fix: stop writing without error when hitting broken pipe for goose session list (#7858)
  feat(acp): add session/set_mode handler (#7801)
  ...

Author: wpfleger96

.github/CODEOWNERS

@@ -2,5 +2,5 @@
 # See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
 # Documentation owned by DevRel
-/documentation/ @blackgirlbytes @angiejones
+/documentation/ @blackgirlbytes @angiejones @DOsinga
 

.github/copilot-instructions.md

@@ -60,25 +60,25 @@
 - `just check-openapi-schema` - OpenAPI schema validation
 
 **Desktop app checks:**
-- `npm ci` - Fresh dependency install (in `ui/desktop/`)
-- `npm run lint:check` - ESLint + Prettier
-- `npm run test:run` - Vitest tests
+- `pnpm install --frozen-lockfile` - Fresh dependency install (in `ui/desktop/`)
+- `pnpm run lint:check` - ESLint + Prettier
+- `pnpm run test:run` - Vitest tests
 
 **Setup steps CI performs:**
 - Installs system dependencies (libdbus, gnome-keyring, libxcb)
 - Activates hermit environment (`source bin/activate-hermit`)
-- Caches Cargo and npm dependencies
-- Runs `npm ci` before any npm scripts (ensures all packages are installed)
+- Caches Cargo and pnpm dependencies
+- Runs `pnpm install --frozen-lockfile` before any pnpm scripts (ensures all packages are installed)
 
-**Key insight**: Commands like `npx` check local `node_modules` first, which CI installs via `npm ci`. Don't flag these as broken unless you can explain why CI setup wouldn't handle it.
+**Key insight**: Commands like `npx` check local `node_modules` first, which CI installs via `pnpm install --frozen-lockfile`. Don't flag these as broken unless you can explain why CI setup wouldn't handle it.
 
 ## Skip These (Low Value)
 
 Do not comment on:
 - **Style/formatting** - CI handles this (rustfmt, prettier)
 - **Clippy warnings** - CI handles this (clippy)
 - **Test failures** - CI handles this (full test suite)
-- **Missing dependencies** - CI handles this (npm ci will fail)
+- **Missing dependencies** - CI handles this (pnpm install will fail)
 - **Minor naming suggestions** - unless truly confusing
 - **Suggestions to add comments** - for self-documenting code
 - **Refactoring suggestions** - unless there's a clear bug or maintainability issue

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

@@ -60,7 +60,7 @@ jobs:
           # Update version in package.json
           source ./bin/activate-hermit
           cd ui/desktop
-          npm version ${{ inputs.version }} --no-git-tag-version --allow-same-version
+          pnpm version ${{ inputs.version }} --no-git-tag-version --allow-same-version
 
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5  # v2.8.2
@@ -94,18 +94,18 @@ jobs:
         run: |
           cp target/x86_64-apple-darwin/release/goosed ui/desktop/src/bin/goosed
 
-      - name: Cache npm dependencies
+      - name: Cache pnpm dependencies
         uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: |
             ui/desktop/node_modules
             .hermit/node/cache
-          key: intel-npm-cache-v1-${{ runner.os }}-${{ hashFiles('ui/desktop/package-lock.json') }}
+          key: intel-pnpm-cache-v1-${{ runner.os }}-${{ hashFiles('ui/desktop/pnpm-lock.yaml') }}
           restore-keys: |
-            intel-npm-cache-v1-${{ runner.os }}-
-            
+            intel-pnpm-cache-v1-${{ runner.os }}-
+
       - name: Install dependencies
-        run: source ../../bin/activate-hermit && npm ci
+        run: source ../../bin/activate-hermit && pnpm install --frozen-lockfile
         working-directory: ui/desktop
 
       # Configure Electron builder for Intel architecture
@@ -125,7 +125,7 @@ jobs:
           attempt=0
           max_attempts=2
           until [ $attempt -ge $max_attempts ]; do
-            npm run bundle:intel && break
+            pnpm run bundle:intel && break
             attempt=$((attempt + 1))
             echo "Attempt $attempt failed. Retrying..."
             sleep 5

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

@@ -37,8 +37,9 @@ jobs:
           rm -f Cargo.toml.bak
 
           # Update version in package.json
+          source ./bin/activate-hermit
           cd ui/desktop
-          npm version ${{ inputs.version }} --no-git-tag-version --allow-same-version
+          pnpm version ${{ inputs.version }} --no-git-tag-version --allow-same-version
 
       - name: Debug workflow info
         env:
@@ -120,21 +121,21 @@ jobs:
           chmod +x ui/desktop/src/bin/goosed
           ls -la ui/desktop/src/bin/
 
-      - name: Cache npm dependencies
+      - name: Cache pnpm dependencies
         uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: |
             ui/desktop/node_modules
             .hermit/node/cache
-          key: linux-npm-cache-v1-${{ runner.os }}-${{ hashFiles('ui/desktop/package-lock.json') }}
+          key: linux-pnpm-cache-v1-${{ runner.os }}-${{ hashFiles('ui/desktop/pnpm-lock.yaml') }}
           restore-keys: |
-            linux-npm-cache-v1-${{ runner.os }}-
+            linux-pnpm-cache-v1-${{ runner.os }}-
 
-      - name: Install npm dependencies
+      - name: Install pnpm dependencies
         run: |
           source ./bin/activate-hermit
           cd ui/desktop
-          npm ci
+          pnpm install --frozen-lockfile
           # Verify installation
           ls -la node_modules/.bin/ | head -5
 
@@ -145,7 +146,7 @@ jobs:
           echo "Building Linux packages (.deb, .rpm, and .flatpak)..."
 
           # Build all configured packages
-          npm run make -- --platform=linux --arch=x64
+          pnpm run make -- --platform=linux --arch=x64
 
           echo "Build completed. Checking output..."
           ls -la out/

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

@@ -55,16 +55,19 @@ jobs:
         with:
           node-version: 24.10.0
 
+      - name: Install pnpm
+        run: npm install -g pnpm@10.30.3
+
       - name: Cache node_modules
         uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: |
             node_modules
             ui/desktop/node_modules
             .hermit/node/cache
-          key: windows-npm-cache-v1-${{ runner.os }}-node24-${{ hashFiles('**/package-lock.json') }}
+          key: windows-pnpm-cache-v1-${{ runner.os }}-node24-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            windows-npm-cache-v1-${{ runner.os }}-node24-
+            windows-pnpm-cache-v1-${{ runner.os }}-node24-
 
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
@@ -130,17 +133,17 @@ jobs:
           git config --global url."https://github.com/".insteadOf "git@github.com:"
           git config --global url."https://github.com/".insteadOf "git+ssh://git@github.com/"
 
-      - name: Build desktop UI with npm
+      - name: Build desktop UI with pnpm
         shell: bash
         env:
           ELECTRON_PLATFORM: win32
         run: |
           cd ui/desktop
 
-          npm ci
+          pnpm install --frozen-lockfile
           node scripts/build-main.js
           node scripts/prepare-platform-binaries.js
-          npm run make -- --platform=win32 --arch=x64
+          pnpm run make -- --platform=win32 --arch=x64
 
       - name: Copy exe to final out folder and prepare flat distribution
         shell: bash

.github/workflows/bundle-desktop.yml

@@ -105,7 +105,7 @@ jobs:
           source ./bin/activate-hermit
           # Update version in package.json 
           cd ui/desktop
-          npm version "${VERSION}" --no-git-tag-version --allow-same-version
+          pnpm version "${VERSION}" --no-git-tag-version --allow-same-version
 
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
@@ -131,18 +131,18 @@ jobs:
         run: |
           cp target/release/goosed ui/desktop/src/bin/goosed
 
-      - name: Cache npm dependencies
+      - name: Cache pnpm dependencies
         uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: |
             ui/desktop/node_modules
             .hermit/node/cache
-          key: macos-npm-cache-v1-${{ runner.os }}-${{ hashFiles('ui/desktop/package-lock.json') }}
+          key: macos-pnpm-cache-v1-${{ runner.os }}-${{ hashFiles('ui/desktop/pnpm-lock.yaml') }}
           restore-keys: |
-            macos-npm-cache-v1-${{ runner.os }}-
+            macos-pnpm-cache-v1-${{ runner.os }}-
 
       - name: Install dependencies
-        run: source ../../bin/activate-hermit && npm ci
+        run: source ../../bin/activate-hermit && pnpm install --frozen-lockfile
         working-directory: ui/desktop
 
       # Check disk space before bundling
@@ -155,7 +155,7 @@ jobs:
           attempt=0
           max_attempts=2
           until [ $attempt -ge $max_attempts ]; do
-            npm run bundle:default && break
+            pnpm run bundle:default && break
             attempt=$((attempt + 1))
             echo "Attempt $attempt failed. Retrying..."
             sleep 5

.github/workflows/cargo-machete.yml

@@ -0,0 +1,24 @@
+name: "Unused Dependencies"
+on:
+  push:
+    paths:
+      - '.github/workflows/cargo-machete.yml'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/*.rs'
+  pull_request:
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/*.rs'
+  workflow_dispatch:
+
+jobs:
+  machete:
+    runs-on: ubuntu-latest
+    if: github.repository == 'block/goose'
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: bnjbvr/cargo-machete@7959c845782fed02ee69303126d4a12d64f1db18 # v0.9.1

.github/workflows/ci.yml

@@ -120,7 +120,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Install Node.js Dependencies for OpenAPI Check
-        run: source ../../bin/activate-hermit && npm ci
+        run: source ../../bin/activate-hermit && pnpm install --frozen-lockfile
         working-directory: ui/desktop
 
       - name: Check OpenAPI Schema is Up-to-Date
@@ -141,28 +141,24 @@ jobs:
       # Temporarily disabled due to GitHub Actions bug on macOS runners
       # https://github.com/actions/runner-images/issues/13341
       # https://github.com/actions/runner/issues/4134
-      # - name: Cache npm dependencies
+      # - name: Cache pnpm dependencies
       #   uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
       #   with:
       #     path: |
       #       ui/desktop/node_modules
       #       .hermit/node/cache
-      #     key: ci-npm-cache-v1-${{ runner.os }}-${{ hashFiles('ui/desktop/package-lock.json') }}
+      #     key: ci-pnpm-cache-v1-${{ runner.os }}-${{ hashFiles('ui/desktop/pnpm-lock.yaml') }}
       #     restore-keys: |
-      #       ci-npm-cache-v1-${{ runner.os }}-
-
-      - name: Check lockfile has cross-platform entries
-        run: ./scripts/check-lockfile-platforms.sh
-        working-directory: ui/desktop
+      #       ci-pnpm-cache-v1-${{ runner.os }}-
 
       - name: Install Dependencies
-        run: source ../../bin/activate-hermit && npm ci
+        run: source ../../bin/activate-hermit && pnpm install --frozen-lockfile
         working-directory: ui/desktop
 
       - name: Run Lint
-        run: source ../../bin/activate-hermit && npm run lint:check
+        run: source ../../bin/activate-hermit && pnpm run lint:check
         working-directory: ui/desktop
 
       - name: Run Tests
-        run: source ../../bin/activate-hermit && npm run test:run
+        run: source ../../bin/activate-hermit && pnpm run test:run
         working-directory: ui/desktop

.github/workflows/pr-smoke-test.yml

@@ -108,7 +108,7 @@ jobs:
           node-version: '22'
 
       - name: Install agentic providers
-        run: npm install -g @anthropic-ai/claude-code @openai/codex @google/gemini-cli
+        run: npm install -g @anthropic-ai/claude-code @openai/codex @google/gemini-cli @zed-industries/claude-agent-acp @zed-industries/codex-acp
 
       - name: Run Smoke Tests with Provider Script
         env:
@@ -267,7 +267,7 @@ jobs:
         run: chmod +x target/debug/goosed
 
       - name: Install Node.js Dependencies
-        run: source ../../bin/activate-hermit && npm ci
+        run: source ../../bin/activate-hermit && pnpm install --frozen-lockfile
         working-directory: ui/desktop
 
       - name: Run Integration Tests
@@ -279,5 +279,5 @@ jobs:
           SHELL: /bin/bash
         run: |
             echo 'export PATH=/some/fake/path:$PATH' >> $HOME/.bash_profile
-            source ../../bin/activate-hermit && npm run test:integration:debug
+            source ../../bin/activate-hermit && pnpm run test:integration:debug
         working-directory: ui/desktop

.husky/pre-commit

@@ -1,7 +1,7 @@
 # Only auto-format desktop TS code if relevant files are modified
 if git diff --cached --name-only | grep -q "^ui/desktop/"; then
   if [ -d "ui/desktop" ]; then
-    cd ui/desktop && npx lint-staged
+    cd ui/desktop && pnpm exec lint-staged
   else
     echo "Warning: ui/desktop directory does not exist, skipping lint-staged"
   fi